style fixup: remote trailing whitespace from our source lines Since Eclipse is now configured to strip trailing whitespace from a line when saving a source file, we fix up any older source file that still has trailing whitespace on the end of a line. Change-Id: Ifa03d4b69f28536c6773702eb79b49fb16844ed1 Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/Documentation/cmd-create-project.txt b/Documentation/cmd-create-project.txt index d1e08b1..5b1806d 100644 --- a/Documentation/cmd-create-project.txt +++ b/Documentation/cmd-create-project.txt
@@ -100,7 +100,7 @@ Create a new project with a description: ==== - $ ssh -p 29418 review.example.com gerrit create-project --name tool.git --description "'Tools used by build system'" + $ ssh -p 29418 review.example.com gerrit create-project --name tool.git --description "'Tools used by build system'" ==== Note that it is necessary to quote the description twice. The local
diff --git a/Documentation/cmd-show-caches.txt b/Documentation/cmd-show-caches.txt index 301864a..ee0cfda 100644 --- a/Documentation/cmd-show-caches.txt +++ b/Documentation/cmd-show-caches.txt
@@ -38,7 +38,7 @@ hit% : 85% hit%.memory : 55% hit%.disk : 30% - + cache "openid": items : 8 evictions : 0 @@ -46,7 +46,7 @@ ttl.live : 5.00 mins avg.get : 1.00 ms hit% : 5% - + cache "sshkeys": items : 4 evictions : 0 @@ -54,12 +54,12 @@ ttl.live : inf avg.get : 0.06 ms hit% : 92% - + JGit Buffer Cache: open files : 9 loaded : 9.99 mb mem% : 3% - + JVM Heap: max : 880.00 mb inuse : 166.96 mb
diff --git a/Documentation/cmd-show-connections.txt b/Documentation/cmd-show-connections.txt index b38d7f2..6a79502 100644 --- a/Documentation/cmd-show-connections.txt +++ b/Documentation/cmd-show-connections.txt
@@ -68,7 +68,7 @@ -------------------------------------------------------------- 14:02:47 00:00:00 jdoe jdoe-desktop.example.com [ gerrit-show-connections ] - + -- ==== @@ -79,7 +79,7 @@ -------------------------------------------------------------- 14:02:48 00:00:00 a/1001240 10.0.0.1 [ gerrit-show-connections -n ] - + -- ====
diff --git a/Documentation/cmd-show-queue.txt b/Documentation/cmd-show-queue.txt index d646a49..a42703b 100644 --- a/Documentation/cmd-show-queue.txt +++ b/Documentation/cmd-show-queue.txt
@@ -35,7 +35,7 @@ S:: Current state of the task. States are: + -* `D`: task is complete, but hasn't released its worker yet. +* `D`: task is complete, but hasn't released its worker yet. * `C`: task has been cancelled, but hasn't left the queue yet. * `R`: task is actively running on a worker thread. * `W`: task is ready to run, waiting for a worker thread.
diff --git a/Documentation/dev-design.txt b/Documentation/dev-design.txt index 74ac038..848b7bf 100644 --- a/Documentation/dev-design.txt +++ b/Documentation/dev-design.txt
@@ -281,7 +281,7 @@ Gerrit integrates with an existing git-daemon installation by optionally displaying `git://` URLs for users to download a -change through the native Git protocol. +change through the native Git protocol. Gerrit integrates with any OpenID provider for user authentication, making it easier for users to join a Gerrit site and manage their
diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt index 7c2338d..416f2a3 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt
@@ -103,7 +103,7 @@ Launch Gerrit ------------- -Open Run->Debug Configurations... +Open Run->Debug Configurations... Under Java Application find `gerrit_debug` (not Mac OS X) or `gerrit_macos` (Mac OS X only) to start the GWT hosted
diff --git a/Documentation/user-signedoffby.txt b/Documentation/user-signedoffby.txt index a535d59..4190c35 100644 --- a/Documentation/user-signedoffby.txt +++ b/Documentation/user-signedoffby.txt
@@ -57,7 +57,7 @@ Some people also put extra tags at the end. They'll just be ignored for now, but you can do this to mark internal company procedures or just -point out some special detail about the sign-off. +point out some special detail about the sign-off. If you are a subsystem or branch maintainer, sometimes you need to slightly modify patches you receive in order to merge them, because the code is not
diff --git a/Documentation/user-upload.txt b/Documentation/user-upload.txt index 8619379..81e505d 100644 --- a/Documentation/user-upload.txt +++ b/Documentation/user-upload.txt
@@ -223,10 +223,10 @@ $ git rebase -i HEAD~3 ; # edit "A", insert D before B ; # now series is A'-D-B'-C' - $ git push ... - HEAD:refs/for/master - HEAD~3:refs/changes/1500 - HEAD~1:refs/changes/1501 + $ git push ... + HEAD:refs/for/master + HEAD~3:refs/changes/1500 + HEAD~1:refs/changes/1501 HEAD~0:refs/changes/1502 ; # upload replacements ====
diff --git a/pom.xml b/pom.xml index 894a9a8..a654e6e 100644 --- a/pom.xml +++ b/pom.xml
@@ -332,7 +332,7 @@ <executions> <execution> <goals> - <goal>compile</goal> + <goal>compile</goal> </goals> </execution> </executions> @@ -431,7 +431,7 @@ </copy> <apply executable="gzip" addsourcefile="false"> - <arg value="-9"/> + <arg value="-9"/> <fileset dir="${m}" includes="**/*.html,**/*.css"/> <redirector> diff --git a/src/main/java/com/google/gerrit/client/account/AccountConstants.properties b/src/main/java/com/google/gerrit/client/account/AccountConstants.properties index e130b3f..88585c2 100644 --- a/src/main/java/com/google/gerrit/client/account/AccountConstants.properties +++ b/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
@@ -5,7 +5,7 @@ registeredOn = Registered accountId = Account ID showSiteHeader = Show Site Header -useFlashClipboard = Use Flash Clipboard Widget +useFlashClipboard = Use Flash Clipboard Widget defaultContextFieldLabel = Default Context: maximumPageSizeFieldLabel = Maximum Page Size: contextWholeFile = Whole File
diff --git a/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties index 0328310..b8ea8fb 100644 --- a/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties +++ b/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
@@ -7,7 +7,7 @@ buttonAddGroupMember = Add buttonRenameGroup = Rename Group buttonSaveDescription = Save Description -buttonCreateGroup = Create Group +buttonCreateGroup = Create Group buttonChangeGroupOwner = Change Owner buttonChangeGroupType = Change Type buttonSelectGroup = Select
diff --git a/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties b/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties index 06123c7..6feb69a 100644 --- a/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties +++ b/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties
@@ -1,4 +1,3 @@ group = Group {0} project = Project {0} deletedGroup = Deleted Group {0} - \ No newline at end of file diff --git a/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java b/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java index 4a11235..b8ce1fe 100644 --- a/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java +++ b/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java
@@ -26,7 +26,7 @@ /** * Request an update to the change's star status. - * + * * @param id unique id of the change, must not be null. * @param on true if the change should now be starred; false if it should now * be not starred.
diff --git a/src/main/java/com/google/gerrit/client/data/AccountInfo.java b/src/main/java/com/google/gerrit/client/data/AccountInfo.java index 90dde97..aa6b8f9 100644 --- a/src/main/java/com/google/gerrit/client/data/AccountInfo.java +++ b/src/main/java/com/google/gerrit/client/data/AccountInfo.java
@@ -38,7 +38,7 @@ /** * Create an account description from a real data store record. - * + * * @param a the data store record holding the specific account details. */ public AccountInfo(final Account a) { diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java index c8aa4da..aff32cc 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java +++ b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java
@@ -19,7 +19,7 @@ /** * An agreement {@link Account} must acknowledge to contribute changes. - * + * * @see AccountAgreement */ public final class ContributorAgreement { @@ -79,7 +79,7 @@ /** * Create a new agreement. - * + * * @param newId unique id, see {@link ReviewDb#nextAccountId()}. * @param name a short title/name for the agreement. */ diff --git a/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java b/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java index 34d464f..ff4eee07 100644 --- a/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java +++ b/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
@@ -105,7 +105,7 @@ /** * Changes the visible state of this panel's content. - * + * * @param isOpen <code>true</code> to open, <code>false</code> to close */ public void setOpen(final boolean isOpen) { diff --git a/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java b/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java index fd6a936..4fc4456 100644 --- a/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java +++ b/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
@@ -33,7 +33,7 @@ public abstract class DirectScreenLink extends InlineHyperlink { /** * Creates a link with its text and target history token specified. - * + * * @param text the hyperlink's text * @param historyToken the history token to which it will link */ diff --git a/src/main/java/com/google/gerrit/public/gerrit.css b/src/main/java/com/google/gerrit/public/gerrit.css index 33cf65b..ebda06b 100644 --- a/src/main/java/com/google/gerrit/public/gerrit.css +++ b/src/main/java/com/google/gerrit/public/gerrit.css
@@ -78,7 +78,7 @@ -moz-border-radius-topright: 8px; -moz-border-radius-bottomleft: 0; -moz-border-radius-bottomright: 0; - + -webkit-border-top-left-radius: 8px; -webkit-border-top-right-radius: 8px; -webkit-border-bottom-left-radius: 0px; @@ -393,7 +393,7 @@ .gerrit-AccountDashboard.gerrit-ChangeTable .ActiveRow { background: #ffffcc; } - + .gerrit-ChangeTable .C_ID { width: 3.5em; } @@ -1025,7 +1025,7 @@ -moz-border-radius-topright: 8px; -moz-border-radius-bottomleft: 8px; -moz-border-radius-bottomright: 8px; - + -webkit-border-top-left-radius: 8px; -webkit-border-top-right-radius: 8px; -webkit-border-bottom-left-radius: 8px; diff --git a/src/main/java/com/google/gerrit/server/FileTypeRegistry.java b/src/main/java/com/google/gerrit/server/FileTypeRegistry.java index fd6232f..83f87f9 100644 --- a/src/main/java/com/google/gerrit/server/FileTypeRegistry.java +++ b/src/main/java/com/google/gerrit/server/FileTypeRegistry.java
@@ -20,7 +20,7 @@ public interface FileTypeRegistry { /** * Get the most specific MIME type available for a file. - * + * * @param path name of the file. The base name (component after the last '/') * may be used to help determine the MIME type, such as by examining * the extension (portion after the last '.' if present). @@ -35,7 +35,7 @@ /** * Is this content type safe to transmit to a browser directly? - * + * * @param type the MIME type of the file content. * @return true if the Gerrit administrator wants to permit this content to be * served as-is; false if the administrator does not trust this diff --git a/src/main/java/com/google/gerrit/server/mail/EmailSender.java b/src/main/java/com/google/gerrit/server/mail/EmailSender.java index 86bb4ff..411e6ca 100644 --- a/src/main/java/com/google/gerrit/server/mail/EmailSender.java +++ b/src/main/java/com/google/gerrit/server/mail/EmailSender.java
@@ -23,7 +23,7 @@ /** * Sends an email message. - * + * * @param from who the message is from. * @param rcpt one or more address where the message will be delivered to. * This list overrides any To or CC headers in {@code headers}. diff --git a/src/main/java/com/google/gerrit/server/ssh/scproot/bin/gerrit-cherry-pick b/src/main/java/com/google/gerrit/server/ssh/scproot/bin/gerrit-cherry-pick index f17e8ea..007faa4 100644 --- a/src/main/java/com/google/gerrit/server/ssh/scproot/bin/gerrit-cherry-pick +++ b/src/main/java/com/google/gerrit/server/ssh/scproot/bin/gerrit-cherry-pick
@@ -3,19 +3,19 @@ # Part of Gerrit Code Review (http://code.google.com/p/gerrit/) # # Copyright (C) 2009 The Android Open Source Project -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# usage() { echo >&2 "usage: $0 remote changeid..." diff --git a/src/main/java/com/google/gerrit/server/ssh/scproot/hooks/commit-msg b/src/main/java/com/google/gerrit/server/ssh/scproot/hooks/commit-msg index 0ad9190..e74537d 100644 --- a/src/main/java/com/google/gerrit/server/ssh/scproot/hooks/commit-msg +++ b/src/main/java/com/google/gerrit/server/ssh/scproot/hooks/commit-msg
@@ -3,19 +3,19 @@ # Part of Gerrit Code Review (http://code.google.com/p/gerrit/) # # Copyright (C) 2009 The Android Open Source Project -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# CHANGE_ID_AFTER="Bug|Issue" MSG="$1"
diff --git a/src/main/webapp/WEB-INF/LegacyGerrit.html b/src/main/webapp/WEB-INF/LegacyGerrit.html index 5261b57..5050bf2 100644 --- a/src/main/webapp/WEB-INF/LegacyGerrit.html +++ b/src/main/webapp/WEB-INF/LegacyGerrit.html
@@ -13,7 +13,7 @@ var r = '/Gerrit'; if (href.length >= r.length - && href.substring(href.length - r.length) == r) { + && href.substring(href.length - r.length) == r) { href = href.substring(0, href.length - r.length + 1) + token; } else { href = '.' + token; diff --git a/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml b/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml index e83c9bb..cbc4343 100644 --- a/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml +++ b/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml
@@ -45,7 +45,7 @@ <Set name="username">gerrit2</Set> <Set name="password">secretkey</Set> --> -<!-- MySQL +<!-- MySQL <Set name="driverClassName">com.mysql.jdbc.Driver</Set> <Set name="url">jdbc:mysql://localhost/reviewdb?user=gerrit2&password=secretkey</Set> -->
diff --git a/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml b/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml index 56b7af0..117bf61 100644 --- a/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml +++ b/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml
@@ -45,7 +45,7 @@ <Set name="username">gerrit2</Set> <Set name="password">secretkey</Set> --> -<!-- MySQL +<!-- MySQL <Set name="driverClassName">com.mysql.jdbc.Driver</Set> <Set name="url">jdbc:mysql://localhost/reviewdb?user=gerrit2&password=secretkey</Set> -->
diff --git a/src/main/webapp/WEB-INF/sql/upgrade007_008.sql b/src/main/webapp/WEB-INF/sql/upgrade007_008.sql index 45b4889..40179e4 100644 --- a/src/main/webapp/WEB-INF/sql/upgrade007_008.sql +++ b/src/main/webapp/WEB-INF/sql/upgrade007_008.sql
@@ -18,7 +18,7 @@ UPDATE project_rights SET max_value = 2 WHERE max_value = 1 - AND category_id = 'pTAG'; + AND category_id = 'pTAG'; UPDATE project_rights SET min_value = max_value, max_value = min_value
diff --git a/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql b/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql index ef2b7ef..6f68838 100644 --- a/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql +++ b/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql
@@ -13,7 +13,7 @@ INSERT INTO approval_categories (name, position, function_name, category_id) VALUES -('Owner', -1, 'NoOp', 'OWN'); +('Owner', -1, 'NoOp', 'OWN'); INSERT INTO approval_category_values (category_id, value, name) diff --git a/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql b/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql index 6212d4a..b05f84d 100644 --- a/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql +++ b/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql
@@ -85,7 +85,7 @@ AND account_id <> (SELECT s.account_id FROM account_ssh_keys r, accounts s WHERE s.ssh_user_name = accounts.ssh_user_name AND r.account_id = s.account_id - AND r.last_used_on = + AND r.last_used_on = (SELECT MAX(k.last_used_on) FROM account_ssh_keys k, accounts b WHERE b.ssh_user_name = accounts.ssh_user_name
diff --git a/src/main/webapp/WEB-INF/web-jetty.xml b/src/main/webapp/WEB-INF/web-jetty.xml index 4ae9280..084d6c6 100644 --- a/src/main/webapp/WEB-INF/web-jetty.xml +++ b/src/main/webapp/WEB-INF/web-jetty.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> <!-- - This is for hosted mode debugging only. + This is for hosted mode debugging only. --> <Configure class="org.mortbay.jetty.webapp.WebAppContext"> <Set name="extraClasspath">target/classes</Set>
